Development

Pull in changes for PRWIDGET-1549 before they get lost