#1610 and #1687

finished #1610 and #1687.