Merge bug/16989 into develop