[PATCH 09/11] Added per ticket #130.