Initial commit for issue 2616

Signed-off-by: Dan Swartzendruber <dswartz@druber.com>