NMS-5609 fix category editing
Merge remote-tracking branch 'origin/1.10' into space-integration-12.3-code-freeze-branch
Merge branch 'space-integration-12.3-code-freeze-branch'
fix marquee selection bug