The MENT-1438 should be fixed in the CS as well.
fixing patch https://github.com/MariaDB/server/commit/add5137d84a41c3f45f18b149bd90099e7256cb7
Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.
fixing patch
https://github.com/MariaDB/server/commit/add5137d84a41c3f45f18b149bd90099e7256cb7