Fix bug with non-existing raw paste
Merge branch 'master' into develop