[Andr] to preMaster

include Oleg's pull request
+ [Andr] changes