Adapting some Xlyre actions to the new action flow.
Merging changes