merge val1984-master