Merge pull request #8560 from AlexRadch/Deconstruction