Fix bug for incorrect Builder DI configuraton
hotfix-1.4.5
Merge branch 'hotfix-1.4.5' into dev