Merge "Add some more transition filter properties" into sc-v2-dev