merge with branch “Kelly”