Add feature part of PLUGIN-58.

Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>