Added Nek changes, fixing things

Ramon Nourequested to merge
marc/nek5000 into main

There is a waiting/sleep issue, detected and corrected by Marc

Merge request reports