Issue #3200162: Convert the latest patch (#9) to a merge request and update the docblock as per #16.
Closes #3200162