Merge "Add publisher configuration and fix issues"