Merge "Binder file module" into main