PR: 32772 Submitted by: Sergey Skvortsov <skv@protey.ru>
Prompted by: vanilla
PR: 25769 Submitted by: Johann Visagie <johann@egenetics.com>