Merge "Add more debug logs for directory update process"