job fixed
Merge branch 'jog' into paged