Merge S-01814

This is a nearly stable release