Common and specific 40x and 40s wavers

It would be interesting to investigate if it is possible to make a common wavers for the 40s and 40x project, and also add specific wavers as this is probably also needed. See !8 (merged) for original post about it.