merges from testing into master are reviewed

avoid "hanging" inside merge request.