Portal 20260519_fix17