[Dev] Merged with forgotten updates.
Merge branch 'trunk' into releases