Revert "Revert "Runtime resource overlay, iteration 2""