Merge branch 'idea2' into idea1