merge fix for selflink po problem