[BZ 1032033] ... - also include intentional-api-change