Merge initial development branch with main branch

I want to merge my development branch with the main one so we can continue work on the official one so we can continue our work there.

cc: @catalinmiron @skidding