build 816 Filtering out of external images should include removal of external base reference.