Merge commit 'c30ad3a3fcfc66d0c1757a50afe413d9942d7793' into less-critical