CRW-0792 by davehare
_