Merge "BUG-731 : extracted parts of long methods to separate methods - added test"