Fixes LBCORE-1001.
Milestone changed to v8r5p1
Milestone changed to v8r5p2
Status changed to merged
mentioned in commit 23ce56a8