Merge remote-tracking branch 'origin/master' into amakeev/cmake-configs