Merge "Don't consider resources < 0 as invalid" into pi-dev