Merge "Decrease property registration time" into devel/master