Merge changes from category unrelated to Category