update/merge changes from 7.2