Sprint3 bug fixes develop

Same as #272, just on develop.