#1718 rebased for patch