Feature #919