* commit '93a8225e54da124807734ff8e4c7790158d06b7c': Improve robustness of resource overlay test suite.