bugfix-4415,4453,4452,4451: Complete makeover of rfe-1518

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>