Merge branch 'features/add_reference_app'