small security fix.
Merge remote-tracking branch 'origin/master' into new_exec_and_ui