Patches for [patch] ID: 2179754 [sf#2212260] [#955]