Merge "Move status tracking CR to rsync"