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