Improve extraction of Nitro Encodings/Locations
Merge branch 'mbst-7010-nitro' into stage

* mbst-7010-nitro:
  Improve extraction of Nitro Encodings/Locations