Merged against 2.7.9