Merge branches 'js/lsfix', 'pb/config' and 'jn/web' into next