[RCSC] Better compatibility with ABM bouquets.