PSA patch v6 to address some of Amit's review comments [1].
------[1] https://stream.boxwatch.ru/message-id/CAA4eK1JdwQQsxa%2BzpsBW5rCxEfXopYx381nwcCyeXk6mpF8ChQ%40mail.gmail.com
Kind Regards,Peter Smith.Fujitsu Australia