re #7558 Correct category from crystal to Crystal
re #7558 resolve merge conflict
Merge remote-tracking branch 'origin/feature/7558_move_alg_category'