Merge branch power-squashed