fixes #1292
fix about initial load
Merge remote-tracking branch 'origin/maintenance-3.x' into maintenance-3.x