Merge v4.1 into master

Removed ORM proxies - those will be generated on composer install.