Merge "Fix unsynchronized access to marks" into stable/lithium