Added some pragma statements and changed the data type of a singleton method.
Merge branch 'refs/heads/ARC/develop' into ARC/master