Merged #1169