#25906 initial
#25906 js variant
Merge branch 'i25906'