@Stuart: against which branch is this coded? 1.1, right? (can you cherry-pick it against master ... )
@Stuart: against which branch is this coded? 1.1, right?
(can you cherry-pick it against master ... )