Closes part 'C' of issue #1652