Merge pull request #8 from knaufk/FLINK-22036