Change the imagine path to configurable
Merge branch 'hotfix/1.2.1'