Merge "Add required something" into devel/master