FLEX-33874 improve binding performance