Merge branch 'nd/parse-options-aliases'