Noted #877, #1095, #1125