merging LG messages branch