Merge trunk version 190524 into gupc branch.