Synced with latest Scalagios updates