Merge "Updating POMBA image versions"