PR merging. JS bugs fix.