[PATCH 01/11] Added per ticket #122.