merging master to jg_2 branch