Merge remote-tracking branch 'aajanki/wdr_live'