DEV-71 | Update and improve the doc to make sure it's the most up to dat...

Needs highlight here and block bellow