Merge remote-tracking branch 'origin/issue/3729' into issue/3729

# Conflicts:
#	kafka-ui-react-app/src/lib/constants.ts