Backport from local dev