Merge remote-tracking branch 'origin/dispatchToParents' into dispatchToParents

minor changes to code formatting for better legibility