Linted previous commit
Fixed #3577, dev branch regression in drilldowns
Merge remote-tracking branch 'upstream/master'