merge inoutmodel dev