This is what users expect.

fixes #5635
fixes #5585
fixes #4181
fixes #4293
fixes #6086

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>