[#69271638] copy changes; add Mareato image