Merge "Sync implementation with BaseBundle change" into main