Promote xprops from lab.
Merge from develop.