config TODO comment
changelog additions
Merge remote-tracking branch 'origin/develop' into develop