Merge "Add check for null actions" into rvc-dev