Merge branch '1902_mcserv_possible_security_risk'