merge with lr1 branch