Merge "Improved visual base property registration speed" into devel/master