UnrestrictLi: merged #215