Ported Feature from Branch Random Offline Story