New build
Merge changes
Fix disabled check to do string parse