Merge "Add borderline features at transition effect" into devel/master