pull from feature mx2 to master

(was previously pushed to release 1.0)