Custom grid-based inline-component layout for CRMT2, +bug fixes, +cleanups