Release 2.1.5 - Use scratch location