Reminded-by: Matthew Thyer <Matthew.Thyer@dsto.defence.gov.au>
Closes PR #2808. Submitted by: Joseph Koshy <koshy@india.hp.com>