Fix bug when using multiple include keys
Merge commit '71398518ff2dde06d84c7dd7a2cb7824831fa593' into 2.0-patched