optimise
Merge bug26210
Silence warning
Small refactor
Merge in stable