Merge "Improve Policy window"