[packages_10.03.2] batman: merge r29199