Merge "Work on issue #6579997: Mariner entrance animation" into jb-dev