Note Macro spans across right-aligned image

Steps

1. Write some text.
2. Insert a {note} macro under the text.
3. Place cursor on the right of the text and insert an image.
4. Click on the image and click Right-align from the editor toolbar.
5. Save the page.

What happened

The note overlaps the image.

What should have happened

The note should not overlap the image.

Note

This likely affects other macros.