Merge branch 'nd/object-allocation-comments'