Fixes: #6370 and others
Update pasteup buttons
Merge pull request #6381 from guardian/commercial-component-fixes

Commercial component fixes