Merge "Move block code inside Apex section"