Fix 'hide property label'
Merge branch 'master' into develop