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