Merge branch 'fix/with-reject-nil-clause' into 'develop'