rebase on library 3.4.11