Do not use deprecated properties
Merge branch 'master' into feature/create-hive-db-and-user