merge master changes with testing

as explained in the title