Merge bug/17283 into dev