https://github.com/wagoodman/dive/pull/466
https://github.com/wagoodman/dive/pull/451
https://github.com/wagoodman/dive/pull/450
