Merge pull request #5 from knaufk/FLINK-22033