Merge remote-tracking branch 'origin/292-hybrid-vertical-and-horizontal-wrapper' into 292-hybrid-vertical-and-horizontal-wrapper