Merge branch 'feature/SLING-7803-nullability'