Update to latest sources

Change-Id: Ibba9252ab7050c0347eec4faff7d1b98242b2d6e