Merge "Change conflict of some visual's Impl namespace" into devel/master