applied changes on backport