Merge "Move ApplyMask to Image-Load-Thread" into devel/master