Merged fixes for 100:continue and metadata handling