[#74948186] editing category
Merge upcoming commit 'd6e09c641ee6ba36a8c922d080eee90c6c4cabc1'