Fixes #15807 Fixes #15818 Signed-off-by: Keith T. Garner <kgarner@kgarner.com>
Signed-off-by: Keith T. Garner <kgarner@kgarner.com>