Merge branch 'bug/JAL-1583_MSA_webservice_validation' into develop