Alignment with other repositorys

Hi @sean.melissari ,

as mentioned in the other repositories i think we should merge this into development in order to have all repositories on the same state