I have just pushed these patches to master and I'd like to backport them to 2.27 stable branch as well. Please review, especially the things like ChangeLog, NEWS (patch #5), commit messages, etc. Thank you in advance. Regards, Rafal