[PATCH 03/11] Added per ticket #124.