Move to 9.7-SHAPSHOT