workaround for assembly load issue
Merge branch 'hotfix-5.3.4'