More tests fixes
Merge remote-tracking branch 'origin/master'
More tests fixes
Sync build script
fix tests refs #4377