Merge branch 'configure-code-style-on-selected-fragment'