The main issue related to this (T239220) has been resolved. Will reopen if T250084 requires any follow-up from Platform.