OOIION-1669

@jamie-cyber1 please review