Moved include to outside action
Merge branch 'bug/500-on-404' into calliope