Merge branch 'for-rmk-misc' into for-rmk