Feature #965