29978 add code refactoring
29978 add more code refactoring
29251 fix test issues
29251 fix static test
29251 add code refactoring
29251 add backward compatible class
29251 add refactoring, fix media gallery
29251 fix static test
29251 fix empty options
29251 fix media gallery
29251 fix web-api test
29251 add debug in failing web-api test
29251 remove debug
29251 add debug in failing web-api test
29251 add debug in failing web-api test
29251 add variant data provider
29251 clean up code
29251 clean up code
