Merge "Remove base observer" into main