Re #7855 Resolve conflict with master
Re #7855 Fix conflict with develop