Merge branch 'develop' into staging
Merge branch 'develop' into staging
Merge branch 'staging' into develop
Revert "Merge branch 'method_gallery' into develop"

This reverts commit cc4bd1cdb953dc8c0bca3560fa8f837f73ca9be9, reversing
changes made to 2add2f65c133707cc31380a3c0c7c083d02f67c9.

Conflicts:
	modules/ui-common