Merge branch 'master' into dynamic_orders to update advanced model maker