FSW QS fixed with maven patches