Merge "Fix checkSimIsReadyAndGoNext()" into main