Merge "Remove BaseHandle / BaseObject TypeTraits is trivialgit" into devel/master