Feat 3789 fix detail list rebase

This branch rebases the FixDetailList feature branch to the current state of the project's dev branch.