Merge "Revert "Implemented basic CPU image masking"" into devel/master