Fix for [DF-866], investigations&comment for [DF-877].