Merge "C# Improve property injector script" into devel/master