Merge "Implementation of reflection feature" into devel/master