Merge "(Vector) Use one EventThreadCallback" into devel/master