Covering issues from DEVELOPER-1047