The following were folded in from master: ec10c8, a94f49, 29b68c. Also tests for interpolation of select are written and passing.