Merge pull request #4780 from xmcclure/assembly-loader-default