Revert "Sync with latest upstream 4.x"#6

mugge6 merged 1 commit intomasterCandoImage/DataDefinitions:masterfrom

revert-4-sync-with-latest-upstream-4.xCandoImage/DataDefinitions:revert-4-sync-with-latest-upstream-4.xCopy head branch name to clipboard