53230709 merge user script jobs

This branch passes all relevant unit tests now. Should be good to go ...