Conforming to changelog & formatting guidelines #3562