Merge branch 'checkbox-state-for-query-methods' into development