Fix CUP behavior with origin mode
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	modules/session_components/screen.js