Merged the changes from the branch INFR-393-getopt-implementation