Feature request to back port from upstream: https://github.com/serverless/serverless/commit/55059f4e04fcbac3b2f75261095b8df9582cbbc9
Feature request to back port from upstream: serverless/serverless@55059f4