Merge branch '1914_mcserv_unused_variable'