fixup peacock #2783
Merge commit '54b76925905bfb36c0d5a43f61e609b93c838e0b'