port #1743 to develop

port #1743 to develop