[OEM-109] updated with latest event locking changes