[AC21.5] commit followon patch from Rick Rankin