Merge "CIS 5.4.4, 5.4.5"