merged from release-5-3
KFSCNTRB-2088