Merge pull request #19 from knaufk/FLINK-23205