PR: 15313 Submitted by: Ade Lovett <ade@lovett.com>
PR: 15437 Submitted by: Igor Vinokurov <igor@zynaps.ru>
PR: 14518 Submitted by: Ade Lovett <ade@lovett.com>