Merge pull request #1127 from dell/usr/mangirish/newImpl-25620