Version 2.4 - major refactor, incl. the  elimination of 3rd party keystore
Version 2.4 - major refactor, incl. the  elimination of 3rd party keystore