[AC carbon] Synch of Carbon branch to 21.5.13