am 047f8139: (-s ours) am 21a6703d: improvement and fixes for bindings test (DO NOT MERGE)

Merge commit '047f8139fb5808146f13b013265b37e8405bffd8'

* commit '047f8139fb5808146f13b013265b37e8405bffd8':
  improvement and fixes for bindings test (DO NOT MERGE)