Merge "Filter unsupported propIds for current version." into main