Merge "Better support for Resource based flags."