Update sdk to the head of release/4.2

Merged François Grisez requested to merge fix/update_sdk into master

Merge request reports