I guess I will merge this with the main one.
Merged branches and resolved conflicts.