[PATCH 10/11] Added per ticket #131.