#1233 and core js mods
Signed-off-by:KProvance <kevin.provance@gmail.com>