Merge pull request #1623 from lexe-tech/custom-smart-pointers