Merge changes from topic "Backport: tag availability checking mechanism" into sc-v2-dev

* changes:
  Add null checking to fix NullPointerException while creating mock tag
  Add tag availability checking mechanism