Ensure proper propagation of custom keys#3

m90 wants to merge 4 commits intoferdis:masterferdis/nestedjs:masterfrom

m90:masterm90/nestedjs:masterCopy head branch name to clipboard