From-apache/develop-to-confidencesun/MARMOTTA-444

pull from apache/develop to confidencesun/MARMOTTA-444