Upstream version 50~alpha