[AC Carbon] Merge changes between r21-5-13 and r21-5-15 to Carbon