PR: 18287 Submitted by: Michael Joyner <mjoyner@wolf.dyns.cx>
PR: 17353 Submitted by: Andrey Novikov <andrey@novikov.com>