Merge branch 'MDL-64701-category-customfields-master' of https://github.com/dmitriim...