Revert the Revert for 12. Man what an annoying mess I caused.
Merge branch 'release/12.0' into develop

* release/12.0:
  Revert the Revert for 12. Man what an annoying mess I caused.

Conflicts:
	install_amp