Category migration merge

Merge category migration branch to category