CR-IC-7038 remove deprecated storage on write
Do not endlessly indent a block when it can't be aligned, report an error instead
(cherry picked from commit 45982ea)
Final field [CR-IC-6767]
(cherry picked from commit 8a837ab)