Updating Master Page - Component update deletes editable content

I have a master page and a few pages which use the master page for header and footer blocks, including a “home” page.

The problem I have is that when I update the master page, and then do a “Quick update” the home page gets updated with the header/footer changes I’ve made, but the editable content which I have added to “home” gets removed.

I’m not sure if it’s something I have done, or a bug.

Has anyone else experienced this?

I think this might be a duplicate of this report from February.