#184 Review PR

This PR is created for initial reviewing of the changes of #184 because #184 includes many external changes and hard to review.
I think this change needs removing tbh. It's an unsupported version, but there may be a place for this button somewhere.