add properties config
Merge branch 'rest_client' into dev