Branch update for comment-blocks functionality