[FIX] LP-BUG-1169444