Merge "Set SV in use mask based on final fixes"