Issue # 1135