Checklist:

Please check you fulfill ALL of the relevant checkboxes

• Notified docs of any potential USER-facing changes
• Added short description of the change - with relevant motivation and context.
• Branch has the ticket number in its name (along with a ticket summary)
• Commented the code, particularly in hard-to-understand areas
• Added tests that prove my fix is effective or that my feature works
• Ran npm test and it passes
• Changes generate no new warnings
• Changes are backward compatible with older clusters