Feature #1704