@WIP update make file to use latest stable features 2.x version #2857

@WIP #2857