Add possibility to include custom configurations for builds
Merge branch 'release/1.0.6'