Merge commit 'da609f721e54691f27113e877a19637bd332abc3' into less-critical