Merge "Dont parse resource values behind disabled flags" into main