merge dev branches

prep for push to stg