fix(cpt_menu) Ensure cpt items in the menu will have current-page-item class when viewed
Merge remote-tracking branch 'origin/develop' into develop