Merge "Drop gloval OFFLINE_DEPLOYMENT var"