TODO meld into first commit (fixes perspective def)
TODO meld into checkpoint 4 (fixes perspective switching)
TODO meld into first commit (fixes deployment warning)
TODO meld into first commit (workaround for UF-17)