merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 02961d43356d5cdfa9b6340d85c7b3a2e861be35
  1. framework/