- 1.18 misc performance dev branch (#7368)