env. adaptations ...
Merge remote branch 'upstream/master' into b1