Merge "Exception when applying the two new icon shapes" into rvc-dev