Merge branch '12.0' of github.com:sergiocorato/server-backend into 12.0

Merge branch '12.0' of github.com:sergiocorato/server-backend into 12.0 #869