diff --git a/.github/ISSUE_TEMPLATE/non-rendering-bug.md b/.github/ISSUE_TEMPLATE/non-rendering-bug.md
index 297aed591a..e8f5f07931 100644
--- a/.github/ISSUE_TEMPLATE/non-rendering-bug.md
+++ b/.github/ISSUE_TEMPLATE/non-rendering-bug.md
@@ -10,8 +10,11 @@ assignees: ''
 ** If you don't use this template, your issue will be closed **
 
 **Checklist**
-1. Create a sample project that reproduces your bug.
-1. Attach your project as a zip file.
+1. Fork this repository into your account.
+1. Reproduce your issue in the issue-repro module. Issues without a repro in the issue-repro 
+module may be auto-closed.
+
+**Link to fork with a repro in the issue-repro module**
 
 **Describe the bug**
 
diff --git a/.github/ISSUE_TEMPLATE/rendering-bug.md b/.github/ISSUE_TEMPLATE/rendering-bug.md
index c16aa2d346..2aa22a4590 100644
--- a/.github/ISSUE_TEMPLATE/rendering-bug.md
+++ b/.github/ISSUE_TEMPLATE/rendering-bug.md
@@ -1,6 +1,6 @@
 ---
 name: Rendering Bug
-about: Lottie isn't rendering my animation correctly
+about: Lottie isn't visually rendering my animation correctly
 title: ''
 labels: Rendering bug
 assignees: ''
diff --git a/issue-repro/build.gradle b/issue-repro/build.gradle
new file mode 100755
index 0000000000..89edceb2b3
--- /dev/null
+++ b/issue-repro/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "com.airbnb.lottie.issues"
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+}
+
+dependencies {
+    implementation project(':lottie')
+    implementation("androidx.appcompat:appcompat:1.1.0-rc01")
+}
diff --git a/issue-repro/src/main/AndroidManifest.xml b/issue-repro/src/main/AndroidManifest.xml
new file mode 100755
index 0000000000..ff4b350e45
--- /dev/null
+++ b/issue-repro/src/main/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.airbnb.lottie.issues">
+
+    <application
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/issue-repro/src/main/java/com/airbnb/lottie/issues/MainActivity.kt b/issue-repro/src/main/java/com/airbnb/lottie/issues/MainActivity.kt
new file mode 100755
index 0000000000..adc07e2760
--- /dev/null
+++ b/issue-repro/src/main/java/com/airbnb/lottie/issues/MainActivity.kt
@@ -0,0 +1,16 @@
+package com.airbnb.lottie.issues
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityOptionsCompat
+import com.airbnb.lottie.issues.R
+import kotlinx.android.synthetic.main.activity_main.*
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+        // Reproduce any issues here.
+    }
+}
diff --git a/issue-repro/src/main/res/layout/activity_main.xml b/issue-repro/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000000..71b960d84c
--- /dev/null
+++ b/issue-repro/src/main/res/layout/activity_main.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+</FrameLayout>
\ No newline at end of file
diff --git a/issue-repro/src/main/res/mipmap-hdpi/ic_launcher.png b/issue-repro/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100755
index 0000000000..898f3ed59a
Binary files /dev/null and b/issue-repro/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/issue-repro/src/main/res/mipmap-mdpi/ic_launcher.png b/issue-repro/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100755
index 0000000000..64ba76f75e
Binary files /dev/null and b/issue-repro/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/issue-repro/src/main/res/mipmap-xhdpi/ic_launcher.png b/issue-repro/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100755
index 0000000000..e5ed46597e
Binary files /dev/null and b/issue-repro/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/issue-repro/src/main/res/mipmap-xxhdpi/ic_launcher.png b/issue-repro/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..b0907cac3b
Binary files /dev/null and b/issue-repro/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/issue-repro/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/issue-repro/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100755
index 0000000000..2c18de9e66
Binary files /dev/null and b/issue-repro/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/issue-repro/src/main/res/values/strings.xml b/issue-repro/src/main/res/values/strings.xml
new file mode 100755
index 0000000000..dd8717f74c
--- /dev/null
+++ b/issue-repro/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Lottie Issue</string>
+</resources>
diff --git a/settings.gradle b/settings.gradle
index 07e39e0bf4..13f706f459 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':LottieSample', ':lottie'
+include ':LottieSample', ':lottie', ':issue-repro'