bring up to date with upstream changes to address LC bugs