Feature #1078(rev.1)