remake m_active_object_messages
Merge remote-tracking branch 'upstream/master' into next