Synced with remote version and fixed sorting issue for events and visibility of placeholders in forms