allow feature to break across pages
Merge branch 'hotfixes' into dev