Merge master (@ Fix stack blocks that start with inserts)