Merge tag 'release_3_0_15' into tr-integ