fixed BKNDLSS-6062 & BKNDLSS-6164