Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop'