Merge "Remove ImfLock dependencies from *Repository" into main