merge changes for OSNG-198 to upstream, into develop branch