Fix #150
Fix #154
Fix #149
Fix #148
Fix #78
Fix #236
Fix #246
Fix #247
Core: aresource minor changes
Merge remote-tracking branch 'origin/1.2.0a' into 1.2.0a