Merge branch 'develop' into feature/fix-fholgado-90
Revert "Check to make sure our buffer is still there"

This reverts commit bfc56c337f1c13e0958a72f3d419f8ebed67717c.
Merge branch 'feature/fix-fholgado-90' into develop