Merge "BpBinder: remove unused field"