// Merging PR 1070 from DevNet