Merge branch 'develop' after fixing suggested app issues.