Merge commit 'origin/tomato-shibby-RT-N-jya' into tomato-shibby-RT-N