Github user walterddr commented on the issue:
https://github.com/apache/flink/pull/5940
LOL. I think I found a way:
1. Rebase #3764 over to current master;
2. Rebase this branch to the rebased #3764;
3. Make changes on top
:-) ---
