branch5-1 & 2 squashed