Merge branch 'amakeev/cmake-configs' into amakeev/cmake-configs-master