Merge branches 'fix-pr14991' and 'fix-pr14891' into micro