Other patches ASG

Up