Completed change to static methods.
Merge commit '695439f00ba51f28e487e9212a190da1c08e59a0'