info2 second commit
Merge branch 'topic/info2'

info2 no-ff merge.