feature #561