Merge branch 'fix/config-export' into develop
Merge branch 'fix/final-value-if-true' into develop