Merge "Creation, deletion and improved management of change tags"