CONN-1279: PLEASE DO NOT MERGE.