Merge "Revert and fix "Revert "Modify -—with-extensions to throw extension dependency...