Fix import
Merge branch 'master' into view-property-tweaks