UAR-783 - Added code from v3 for UAR-18 FE, fixing docs going to exception in a complex route under specific conditions.