Fixed memory exhausted error avoiding processing ALL apps categories options if not necesary
Bumped version/changelog
Merge branch 'release-3.1.5' into develop