merge 77247 77242
thanks