Fix/retrofit 4.2

Merged jehan requested to merge fix/retrofit_4.2 into master

Merge request reports