Merge "Make encryption action an argument to mkdir"