I did rebase with yours changes and run tests. All are passed so hope this change is not introducing any regression issues.