Merge pull request #305 from wmathurin/unstable20

Latest shared