fix(ci): Merge changes from v2 for release 2.8.5 (4)

fix(ci): Merge changes from v2 for release 2.8.5 (4) #1943