Merge "Nonrtric image versions update"