Sort calendar parameters and bubble "version" to the top as its required to be the first parameter.
Merge branch 'version-first-param'