Further polishing

Issue: SPR-10940
Polishing (along with the Tiles 2.2.2 upgrade in the Spring 4.0 line)

Issue: SPR-11285