adding ptr toggling + small fixes
refresh golden file
Merging origin/dval/master-pending-adding-toggling-ptr into master