[PATCH 05/11] Added per ticket #126.