Merge tag '0.1.5' into develop

Release v0.1.5
removed more overridden confs
rp
Merge branch 'release/0.1.6'