initial commit, issue #54011