Update rules according to commit 8316fffaad84d799f07cb86b24ff7e42e34497a1