Merge "Grant System Gallery rename concessions" into rvc-dev