massive test merge

This merge tries to push all dev changes to production