Apply arguments to init
Merge commit '17bd589925456806110b5fe8159e89e57be9d5a4'