Merge "Modelloader: base image update"