[PAXCDI-113] Support bundle scope