[FIX] Several small fixes

Merged Gabriel Davini requested to merge 8.0-retentions_2017 into 8.0-stage

Merge request reports