Merge "Fix CLI docker env settings"