Merge "Fix default return code for getResource"