diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generateCoreTemplate.js
index 56e69f7b8..0ad75b453 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generateCoreTemplate.js
@@ -62,7 +62,7 @@ module.exports = {
       this.serverless.service.provider.compiledCloudFormationTemplate);
 
     this.serverless.service.provider.coreCloudFormationTemplate =
-      _.clone(this.serverless.service.provider.compiledCloudFormationTemplate);
+      _.cloneDeep(this.serverless.service.provider.compiledCloudFormationTemplate);
 
     return BbPromise.resolve();
   },
diff --git a/lifecycle-changes.md b/lifecycle-changes.md
index 9296f3c7a..feb715ed5 100644
--- a/lifecycle-changes.md
+++ b/lifecycle-changes.md
@@ -69,10 +69,11 @@ In general, the addition of event deprecation enables all plugin authors (may it
 be the Serverless team or external ones) to get rid of old implementations over
 time and encourage people to adapt and use new technologies.
 
-#### Decaring events as deprecated
+#### Declaring events as deprecated
 
 To declare an event as deprecated, simply prefix it with `deprecated#` and optionally
-add the new event that it will be redirected to with `->` at the end. This allows you even to "redirect" deprecated events to completely different events in
+add the new event that it will be redirected to with `->` at the end. This allows you
+even to "redirect" deprecated events to completely different events in
 different commands.
 
 I know that this looks really ugly in the lifecycle array, but this is intentional.
@@ -214,6 +215,8 @@ the `deploy`command.
 
 **package:compileFunctions**
 
+**package:compileEvents**
+
 **package:finalize**
 
     -> aws:package:finalize:mergeCustomProviderResources
@@ -256,6 +259,10 @@ aws:common:validate | Performs the global validation (../lib/validate)
   * Unit tests for new spawn() call signature
     spawn() now accepts specifying commands as string ('cmd:subcmd:subcmd').
     We need a unit test for that.
+* Deploy
+  * Unit tests for extended validation
+    * Check state restore and save
+    * Check file exist checks
 
 # Sample lifecycle implementation (AWS deploy)