Merged New features into integration