Merge "Binding on-demand #10: Remove permanent binding and add registration"