JAL-1847 Merge branch 'thiago' into develop