Merge "Error on duplicate resource with same disabled flag" into main