Merge commit 'fcabe38e9b3abacc0d580bf0513600858aee2eca' into less-critical