Upstream version 47~beta