Included feedback on STD-0.0
Resolved merge conflicts