Merge 'franco/mako/Nightlies 4.3 jss' into sm-4.3-test