Clean and merge the pul request sent by amilaD , for CARBON-14838