Enable cluster mode validation
Merge remote-tracking branch 'origin/compact_page_with_macro' into compact_page_with_macro