Merge "Update builder-model prebuilt to incoroporate latest changes" into idea133