Fix property naming
Merge branch 'master' into function