Squashed 'core/' changes from 8c1118b..cc4a1b6

cc4a1b6 Fix(?) plugin issue
f23bfe4 Merge branch 'develop' into feature/multiarch
b5a7b60 Speed up gradle by enabling daemon

git-subtree-dir: core
git-subtree-split: cc4a1b6034d8e6b99f9cba354360900843f0b6d2
Merge commit '99fd54eeaee0a9320f866605e9a662471181d9b7' into develop