Merge "Add extra hidden api related tags"