Sprint4.2 bug fixes develop

Same as #328.