Feature/4879

PR for #4879