Merge "BaseActivatable" into main