Merge "Fix error when PAC set rapidly" into klp-dev