Build Failure Fix

All issues associated with this milestone can be found using this
filter.

Fixed

• Build issue with Manager class due to cherry picked change that merged incorrectly.
  • Fixed by Christian Noon in Regards to Issue
    #1438.