Merge "Avoid resource I/O when holding ImfLock" into main