Updates to latest dev version and also applies patch

Patch fixes field collection incompatibility