r26787 - Fix more action/preaction stuff by @gausie in

Top