#10054 bug fix
#10054 internal bug fixes