Merge "Buffer transfer and locking workarounds for EVS"