Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f' * commit '264e727775728d0478fcb95855e8ea3801f34c8f': Fix issue #2999795: Runtime restart on Crespo
Merge commit '264e727775728d0478fcb95855e8ea3801f34c8f' * commit '264e727775728d0478fcb95855e8ea3801f34c8f': Fix issue #2999795: Runtime restart on Crespo