implement feature #848