(parser) Merge parser tiles version with branch