removed more overridden confs
rp
Merge branch 'release/0.1.6'
Merge tag '0.1.6' into develop

release/0.1.6