General improvements
Merge remote-tracking branch 'origin/v2_rework' into v2_rework