Make public for 2.061
2.061 fix