Memory optimization #39#40

kfrancis wants to merge 6 commits intojunian:masterjunian/Standard.Licensing:masterfrom

kfrancis:masterkfrancis/Standard.Licensing:masterCopy head branch name to clipboard