Merge "Add new bug fix flag for private space" into main