Merge "olso log sync"