Merge changes I9f2b6b15,I5e1e341e into main

* changes:
  Add support for flagging xml and png files
  Add support for flag in resource directory names