Merge branch 'feature/RDL-118' of gitlab.com:jlack/rdl into feature/RDL-117