update to and merge from 9.3rc1