Integrated bugfix 11129