Syncing with latest Scalagios updates