merge PR #14707 with fixes