2.3 (Fixing conflicts in #262 and #265)