Merge "Fix incorrect and missing rule dependencies"