Confidencesun-from-develop-to-MARMOTTA-444

merge from confidencesun/develop to MARMOTTA-444