Merge commit '6ccc72a9df472b2e1efd10d0c3493d580a9992ca' into di-external