no need of forks anymore

necessary commits merged mainline