Merge "Fix issue #8228463: contradicting public documentation on what..."