Merge "Update CPE tag per latest version manually to ensure bug is stopped from being re-opened"