Optimize the composer_autoload check
feature/session (#3073): Fix a variable name
Merge branch 'develop' into feature/session