Merge branch 'jk/unwanted-advices' into next