Add minor features based on community discussions
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b4d1fed849aa7873af870b7e583ac91dd1ca4cc6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 14940a3c9a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>