Merge branch 'plugin-symbols-protoypes'