Merge "Sources template changes"