CDB-2017 #resolve - whole app views reviewed