1.8.1 merge