Merge branch 'master' into ValueIterator
The merger was carried out in semi-automatic mode