re include changes from commit b45a8077b6dde