spportal merge related changes