This should address ATLSWUPGR-207
Some improvements, but this will need a follow up MR in the future