BKNDLSS-6636 implementation