This MR brings the following changes;
assigned to @hancerli
enabled an automatic merge when all merge checks for d06891a0 pass
merged