Merge "SOL003 API ALign"