Fixing the Action button disappeared after D3 refactoring
Merge commit '0045fb0578cb0e6abdc608ee5b0f0a507ce6f7ba' into HEAD