Started with PR 374 (which is for master) and merged it to development branch, attempting to resolve all merge conflicts