Backport from local development