Merge pull request #23 from knaufk/FLINK-23206