[sr-dev] Changes pushed to branch 4.4