More merging with master (missing model sources only)