user event location with requisite changes to affected code
merge master