Inuits merge

Hi,

Please find here a pull request with the changes that we have made in our internal git branch. Please not that some of the changes have been rebased to have more atomic commits

@arioch I see you have made some changes on the top of sdog branch, so be aware of this PR.

CC: @carroarmato0 @simonsd