Merge "Changed image formats in CBA index"