Much better solution worked out to the problem - applied to v1.23.2