[PATCH 08/11] Added per ticket #129.