[PATCH 07/11] Added per ticket #128.