current site can be null, which failed on checks against undefined
Merge remote-tracking branch 'upstream/release_candidate' into feature_theme-from-release-candidate