This is ready to merge, it should fix the remaining compilation warnings
merged
mentioned in commit a4098037