This patch should go into 3.4 branch first.
We will merge changes from 3.4 into 4.x regularly (weekly/bi-weekly).

Please:

• change "base" branch of this PR: 4.x => 3.4 (use "Edit" button near PR title)
• rebase your commits from 4.x onto 3.4 branch. For example:
  git rebase -i --onto upstream/3.4 upstream/4.x
  (check list of your commits, save and quit (Esc + "wq" + Enter)
  where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
• push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".