merged branch ca-sy-links-optimization into master