Issue-1461 (final)

This should close 1461.