D8 - fixes for [#2202217] and [#1996238]