cosmetic changes before to switch on ms-1_service branch
merge with ms-1_service branch