CAL-912 remove unnecessary workaround after improve jcr query
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/stabilization
Merge commit '10f2b9de57f43befe2bd53bf05c65eca58dcd967' into HEAD