PIM-2404 Ensured attribute option validation