Release v1.12.1 merge