Merge changes Ieddc1113,Ia12217b3

* changes:
  Sync with upstream up to revision 76844b29, important fixes:
  Merge in history of import from 9131ba637f003fb5894e3f6343a27d6322205f18.