Getting ready for spark/firmware#313