Merge "Make prepareModel asynchronous." into oc-mr1-dev