Merge branch 'paz-1008-a'