DEV-18993
DEV-18993 js