Merge "Make rule updates "by user in app" more powerful" into main