Merge "Add bitmask to ZenRule tracking user changes" into main