[issue-5515]