Mariana

Results 2 comments of Mariana

@ekmb yes! the majority of the changes are done, but I'm reviewing bugs before final review

please merge main to this PR so all other languages are up to date for testing