Squash commits from SaberMod & add mka to build