fix: resolve issues #3911 and #3939#3948

Hardikrepo wants to merge 1 commit into

aws:developaws/serverless-application-model:developfrom

Hardikrepo:developHardikrepo/serverless-application-model:developCopy head branch name to clipboard