Merge "Change not to use the mask if it is set to an empty path" into devel/master