Merge branch 'js/rebase-config-bitfix'