Merge "Base: Add default tag manipulation" into pi-dev