Fix scene actions sorting.
Update mapper from upstream