add new item to implement for next release
merged conflicts