Merge "Binder: Flattenable is no longer a hard dependency" into main