Merge branch 'INC-0.2.0'