#3530284: Handle by canonical route access
#3529857: Handle entity neutral access
#3529458: Only move if source file exists
#3529336: Fix property strict typing
#3524323: Treat more edge-cases