backport timo^s workflow setting changes from master