Conn 896

Ready to be merged.