Merge pull request #1857 from slluis/fix-assembly-resolver