0.7.2 merge