Completes enhancement #69.