Update lib and use populate attachments functionality in order to mitigate issues with mismatching content ids