Release 17 - 9.5 ready + mark of mastery added