Support bundle common changes [RTFACT-18753]