Merge from trunk:
* Add some merge infos
* Fix unreachable code warning (fixes #8665)