Vishal #0 Merged from whp-contrib branch