bring over 1.2.5 update from dev branch