Merge "Make ReconcileSdkData more flexible"