Merge "Add Fade Transition" into devel/master