bug fixes v1.1 for productions
resolved merge conflict
r2_commpleted.