Performance enhancements for compose update page
Merge branch 'develop'