Merge "Update user and developer guides for chlorine"