Fixes issue with creating batch actions
Merge commit '3d7f5901356a2e079c4bab7632551353bc4250eb'