Fix incorrectly shown I and R Map-Notify flags
Merge branch 'master' into testing