Hook UI callbacks one by one, keeping construction simple
Merge branch 'master' into builds
7.602