Develop

cherry picked fixes on changelog files by @SamPatt