* commit 'c058d38602a1ffe00e14b4ab32c876c252eabe6d': Small fixes and cleanup of resource config handling.