Merge "Fix bug in transition effect" into devel/master