Merge "Bug 4473 - Ignore unsupported features on table features" into stable/lithium