Merge "Simplify javascript layer behavior enum STRING" into devel/master