Merge catalog\model\catalog with 1.5.5.1