US535 - fix bug when still caring for more than 35 is yes
Merge branch 'development-work', remote-tracking branch 'origin' into development