Merging AramZS fork to be up to date with remote master