PR: 36734 Submitted by: Alex Kapranoff <kappa@agava.com>
PR: 36616 Submitted by: hannes sowa <satbran@web.de>