Merge branch 'jumping-to-source-blocks'