Merge branch 'topic/ro_wordlength' into next