Merge "Some fixes in reconintra" into nextgenv2