Follow up on PR #3795 click, ray, mosaic requirements.
Follow up on PR #3795 click, ray, mosaic requirements.