macros are not being saved when macro editor closed

We are receiving reports from users that our add-on macro is not being saved in Confluence cloud. We use a custom macro editor that saves a macro using AP.confluence.saveMacro().
I can personally reproduce the following scenario for our Gliffy macros:

• create a new macro
• close the macro editor without saving
• create a new macro using the dropdown - insert option (not by typing {name).
• save the macro
• save the page
• macro does not get added to the page and is lost.

It looks like this is related to closed issue https://ecosystem.atlassian.net/browse/CE-982, which was perhaps only partially fixed. Please investigate ASAP, as this is contributing to lost work for many of our customers