Merge security fixes from 0.41.1