Merge branch 'topic/aloop' into topic/misc