Some initial work on 5.4.7.17930

Signed-off-by: netcho <kkotlarski@abv.bg>