Backport silent feature from master