Merge "Add gate job for rfc8040 userfeatures"