D7 - working on [#2256453]