Merged upstream + Fixed misalignments