Merge "bugfix: /resources.json and /APIs cannot be accessed"