backport lotus changes