Merge branch 'features/put_if_present' into 'develop'