Merge branch 'paz-1002-a'