Merge "Improve help message for arnr-type"