WC-449 #comment - edited
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2

Conflicts:
	v2/js/view/notepadView.js
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2