~davidgomes/granite/fix-1116864

1