Merge tag 'v2.7.13'

Test: Manual
Change-Id: Ie874376fa5f5cdb59f67bb71e9da31574f4421c9