Merge branch 'conf-forgotten' into 'develop'

Add changes from install/tpl

See merge request !1136