Merge pull request #8156 from MrPetovan/task/7817-custom-fields-part-2