Merge this in for bedrock/general-wp compatability