Merge branches dev-dathomas and staging

Hopefully this works