Made boolean unrequired to bypass client-side validation issue
Merge remote-tracking branch 'origin/master'