Merge branch 'develop' into ticket-1703
Re: #1703 - checkbox persistence
Merge branch 'ticket-1703' into develop