Merge "Invert dependency between NEM and RowBinder"