Merge branch 'staging' into 241-integrate_cucumber

Conflicts:
	Gemfile.lock