Merge branch '1796_fix_passive'