Upstream release - 4d