Merge "Update documentation for composition and instance states"