Updates from Snap master