NE: fix for reversed actions
Merge remote-tracking branch 'origin/master'