Merge request 21 pushed as 3.1.7.24