Merge branch 'fix/namespace-event-methods-direct-definition' into major/upgrade_to_version_6