Merge Oleg's branch to preMaster

Merge Oleg's branch to preMaster
through a new temporary branch