Feature #1718