Syncing with latest Scalagios changes