Merge "Binding on-demand #6: Transport attributes usage"