Merge newest changes

to retain cli and option compatibility