Merge "Base sigul macros and scripts"