Merge "Fix inval issue" into jb-dev