Merging DevTest into Master

Created by: SecUpwN

⚠ Please do NOT continue work on DevTest, I am about to delete it (see my E-Mail)! This PR is to sync DevTest into Master. Please continue work on Master. Thank you.