Issue #3399
Merge pull request #3407 from snschune/feature_3399

Issue #3399
Merge commit '7d3a428278ff546737b5e2fc106936d33e961006'