Merge pull request #1197 from tom-daubney-arm/buffer_sharing_cleanup

Buffer sharing cleanup