Change the order of getDynamicOption() params
Merge remote-tracking branch 'origin/master'