Merge "Fixed non-deterministic test case" into devel/master