#17355 - update detection of commandline