Integreate latest updates from X-Tags

https://github.com/pennyfx/core/commit/a315d365ad8f38b920af3f98e207aa4b6
314a8f8#diff-19a88ae5f0ddac53c5ba2970ec42ac38