Merge pull request #14 from knaufk/FLINK-22570