resolved bugs B01|B02|B04|B05| Hemanth,Sneha
resolved merge conflict|Hemanth,sneha