Fix portfolio loop
Merge branch 'develop' of https://github.com/CherryFramework/CherryFramework into develop