Merge changes till the git restructuring (REL_2_1_194..BEFORE_OS_CREATE)