Feature #1078