[FOLD] Changes to 'keep SHAMapNodes' based on code review