Adding non interactive mode options(cherry picked from commit ee6ea475d51051fbc6ed49c113bcc715e26b9023)