even more coffee & scrolling notices
Merge branch 'develop' into feature-cart