preliminary 3.17 support