Move fix Issue 12153 to frontend