Merging github lines widget changes into development