Custom binding changes (3.0.13)