fix NPE while building actions and settings in SE
Merge remote-tracking branch 'origin/master'