upgrade: PER related changes

119 files changed