(cherry picked from commit cc8ce59)
(cherry picked from commit de8fb9e)

# Conflicts:
#	src/server/editorServices.ts
#	src/server/project.ts

(cherry picked from commit 456614f)
(cherry picked from commit be30adc)

(cherry picked from commit 16c7bcf)
(cherry picked from commit 8b3c54d)

(cherry picked from commit 7b17f6a)
(cherry picked from commit 63aeacb)

(cherry picked from commit ff09479)
(cherry picked from commit c66a535)

(cherry picked from commit 2721a8c)
(cherry picked from commit 1696df6)

(cherry picked from commit e9e7271)
(cherry picked from commit 35e7717)

(cherry picked from commit 8a67b6d)