updates to match d7.31_master_20