Merge conflicts from master fixed