merge Victor changes with maintenance->complete project