Merge pull request #21 from knaufk/FLINK-23250