Merge branch '2134_am_silent_rules'