merged in mmilutinovic1313 changes as part of #2337947