I've fixed SPR-14840. Please review this.

Comment From: kazuki43zoo

I've resolved a conflict.

Comment From: rstoyanchev

Closing outdated issue.