Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev