BZ-11118 more data binding