backport changes from production