Update prop lists
Remove deprecated dependencies
Merge branch 'cm-11.0' into martincz