Fix #22164, #23056 and #23177: new features added