Merge remote-tracking branch 'origin/paz-932'