MOSYNC-3271. Added Fredrik's changes.
MOSYNC-3271. Separated internal from external events.