Working on comments backport