Merge "TrivialFix: Fix a wrong order bug in resource_cleanup()"