Merge "Break cyclic binder dependency"