Adding deploy checks and reducing code duplication
Begin arcbot message
This merge request is automatically copied from !1249 (merged) orginally made by @maikenp
End arcbot message
Begin arcbot message
This merge request is automatically copied from !1249 (merged) orginally made by @maikenp
End arcbot message