Merge all changes from original github repo
This commit includes all changes made in the gitlab repo, and all changes from the github repo, merged without conflict.
This commit includes all changes made in the gitlab repo, and all changes from the github repo, merged without conflict.