Removing duplicate registration of the ModuleDefaultListener service
Merge remote-tracking branch 'upstream/develop' into develop