Merge "refactor AlphaFunction class to reduce size" into devel/master