[packages_10.03.2] gd: merge r29254