merge in changes from dev