latest core changes from master