Merge branch 'jasa'