local properties for dev test.
Merge branch 'feature-TR' into develop