add support for 'when = manual' (Closes: #511299)