[Parser] Fixed loading (temp again)
Merge remote-tracking branch 'origin/night'