Merge branch 'dev' into main -- pages target fix