LMW-12 Fixed rebase errors