#115: Use adaptive include of ConnectionAdapters