Checkout sidebar correction
Merge remote-tracking branch 'origin/version-4.2' into version-4.4