BACKLOG-4500 : add lock support for external provider
Merge remote-tracking branch 'origin/master'