Implement feature #1505

Signed-off-by: Umair Khan <omerjerk@gmail.com>