Control Panel: page_layout fix
Control Panel: customer transactions edit form rebuild
Merge remote-tracking branch 'origin/1.2.0a' into 1.2.0a