Arm calculation against null pointer on actions
Merge remote-tracking branch 'origin/master'