Merges from rise repo