Template use constant without namespace now
Merge commit '1fe38bf0496513c364eb83a1c33e4ef16d37c6cd' into issue70