Changed merge message
Merged commit ab43024586c8c698e8ea77c26f61626367f3e105 into build/cci