backport of local changes