Merge "Adding scale and crop feature to alpha mask" into devel/master