[OEM-109] view changes for event locking